From ca385af3c491523bf449c02403640ed08e043a4b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 31 Oct 2015 20:24:46 -0400
Subject: [PATCH] HighContrast: Update progressbar styling

Adapt to the changes in the previous commit.
---
 gtk/theme/HighContrast/_common.scss | 52 +++++++++++++----------------
 gtk/theme/HighContrast/gtk.css      | 45 ++++++++++++-------------
 2 files changed, 44 insertions(+), 53 deletions(-)

diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index dd15e17085..6da965c825 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -1776,17 +1776,32 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
 
 //FIXME it's a wip ok?
 
-GtkProgressBar {
-    padding: 0;
-    font-size: 83%;
-    color: $fg_color;
-    &:backdrop {
-      color: $insensitive_fg_color;
-    }
+progressbar {
+  padding: 0;
+  font-size: 83%;
+  color: $fg_color;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 3px;
+  border-color: $borders_color;
+  background-color: mix($borders_color,$bg_color, 35%);
+  box-shadow: inset 1px 1px transparentize(black, 0.9);
+  &:backdrop{
+    color: $insensitive_fg_color;
+    border-color: $backdrop_borders_color;
+    background-color: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
+    box-shadow: 0 1px transparentize(white,1);
+  }
+  &.osd {
+    background-color: transparent;
+    box-shadow: none;
+    border-width: 0;
+    //FIXME: there is a margin on top
+  }
 }
 
 // moving bit
-.progressbar {
+progressbar progress {
   border-width: 1px;
   border-style: solid;
   border-radius: 3px;
@@ -1811,27 +1826,6 @@ GtkProgressBar {
   }
 }
 
-// background
-GtkProgressBar.trough {
-  border-width: 1px;
-  border-style: solid;
-  border-radius: 3px;
-  border-color: $borders_color;
-  background-color: mix($borders_color,$bg_color, 35%);
-  box-shadow: inset 1px 1px transparentize(black, 0.9);
-  &:backdrop{
-    border-color: $backdrop_borders_color;
-    background-color: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
-    box-shadow: 0 1px transparentize(white,1);
-  }
-  &.osd {
-    background-color: transparent;
-    box-shadow: none;
-    border-width: 0;
-    //FIXME: there is a margin on top
-  }
-}
-
 /*************
  * Level Bar *
  *************/
diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index 0658b297c2..2466bc9c4a 100644
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -1976,49 +1976,46 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
 /*****************
  * Progress bars *
  *****************/
-GtkProgressBar {
+progressbar {
   padding: 0;
   font-size: 83%;
-  color: #000; }
-  GtkProgressBar:backdrop {
-    color: gray; }
+  color: #000;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 3px;
+  border-color: gray;
+  background-color: lightgray;
+  box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
+  progressbar:backdrop {
+    color: gray;
+    border-color: #8d8d8d;
+    background-color: #d7d7d7;
+    box-shadow: 0 1px rgba(255, 255, 255, 0); }
+  progressbar.osd {
+    background-color: transparent;
+    box-shadow: none;
+    border-width: 0; }
 
-.progressbar {
+progressbar progress {
   border-width: 1px;
   border-style: solid;
   border-radius: 3px;
   border-color: #000;
   background-color: #000;
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2); }
-  .progressbar.vertical {
+  progressbar progress.vertical {
     box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.2); }
-  .progressbar:backdrop {
+  progressbar progress:backdrop {
     border-color: #000;
     background-color: #000;
     box-shadow: none; }
-  .progressbar.osd {
+  progressbar progress.osd {
     border-width: 0;
     border-radius: 0;
     -GtkProgressBar-xspacing: 0;
     -GtkProgressBar-yspacing: 2px;
     -GtkProgressBar-min-horizontal-bar-height: 2px; }
 
-GtkProgressBar.trough {
-  border-width: 1px;
-  border-style: solid;
-  border-radius: 3px;
-  border-color: gray;
-  background-color: lightgray;
-  box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
-  GtkProgressBar.trough:backdrop {
-    border-color: #8d8d8d;
-    background-color: #d7d7d7;
-    box-shadow: 0 1px rgba(255, 255, 255, 0); }
-  GtkProgressBar.trough.osd {
-    background-color: transparent;
-    box-shadow: none;
-    border-width: 0; }
-
 /*************
  * Level Bar *
  *************/
-- 
2.30.2